bitkeeper revision 1.1691.1.3 (42a6aecafCIqSXqRF1ueb8i0jgar3w)

Fix 'no value returned in non-void function' warnings on x86/64 gcc.
Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/xen/include/asm-x86/string.h b/xen/include/asm-x86/string.h
index 83d1fbb58357b7a1fc0b31835332c402d6474800..6dee130fa72d7941056c2984a398bd59ba2d8eaf 100644 (file)
--- a/xen/include/asm-x86/string.h
+++ b/xen/include/asm-x86/string.h
@@ -238,6 +238,7 @@ static always_inline void * __constant_memcpy(
         }
     }
 #undef COMMON
+    return to;
 }
 
 #define __HAVE_ARCH_MEMCPY
@@ -367,6 +368,7 @@ static always_inline void *__constant_c_and_count_memset(
         }
     }
 #undef COMMON
+    return s;
 }
 
 #define __constant_c_x_memset(s, c, count) \